Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: merge with main#5048

Merged
boydc2014 merged 6 commits intofeature/bot-projectsfrom
fixbotprojectsConflict
Dec 2, 2020
Merged

fix: merge with main#5048
boydc2014 merged 6 commits intofeature/bot-projectsfrom
fixbotprojectsConflict

Conversation

@liweitian
Copy link
Contributor

@liweitian liweitian commented Dec 2, 2020

Description

This pr it to merge with main and solve conflict

Task Item

#minor

GeoffCoxMSFT and others added 6 commits December 1, 2020 10:40
Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
* Updated installOneAuth script to target correct version.

* Better refactor
* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <hatpick@gmail.com>
* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines
* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig
@boydc2014 boydc2014 changed the title fix: solve conflict with main branch fix: merge with main Dec 2, 2020
@boydc2014 boydc2014 merged commit 405c8d3 into feature/bot-projects Dec 2, 2020
@boydc2014 boydc2014 deleted the fixbotprojectsConflict branch December 2, 2020 12:14
benbrown pushed a commit to benbrown/BotFramework-Composer that referenced this pull request May 24, 2021
* try-catch around trigger grouping expressions (microsoft#5017)

Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>

* chore: Updated installOneAuth script to target correct version. (microsoft#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (microsoft#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <hatpick@gmail.com>

* fix: Correct handling of focus for Intellisense fields (microsoft#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (microsoft#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <gcox@microsoft.com>
Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Co-authored-by: Tony Anziano <tonyanziano5@gmail.com>
Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com>
Co-authored-by: Soroush <hatpick@gmail.com>
Co-authored-by: leileizhang <leilzh@microsoft.com>
benbrown pushed a commit that referenced this pull request Jun 11, 2021
* try-catch around trigger grouping expressions (#5017)

Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>

* chore: Updated installOneAuth script to target correct version. (#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <hatpick@gmail.com>

* fix: Correct handling of focus for Intellisense fields (#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <gcox@microsoft.com>
Co-authored-by: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Co-authored-by: Tony Anziano <tonyanziano5@gmail.com>
Co-authored-by: LouisEugeneMSFT <66701106+LouisEugeneMSFT@users.noreply.github.com>
Co-authored-by: Soroush <hatpick@gmail.com>
Co-authored-by: leileizhang <leilzh@microsoft.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants